splash: Accommodate DM_USB in splash_init_usb()

Current implementation of splash_init_usb() requires usb_stor_scan()
which doesn't exist in case of DM_USB simply because real probing
happens right in usb_init().

So disable usage of usb_stor_scan() in case of DM_USB.

Signed-off-by: Alexey Brodkin <[email protected]>
Cc: Nikita Kiryanov <[email protected]>
Cc: Simon Glass <[email protected]>
Cc: Jeroen Hofstee <[email protected]>
Cc: Anatolij Gustschin <[email protected]>
Cc: Robert Winkler <[email protected]>
Reviewed-by: Simon Glass <[email protected]>

diff --git a/common/splash_source.c b/common/splash_source.c
index 914f12f4cb554ca0cb4bade313232c4c625a6099..230b2db4d5b654f01568b3b01ac18f8317328153 100644 (file)
--- a/common/splash_source.c
+++ b/common/splash_source.c
@@ -146,7 +146,11 @@ static int splash_init_usb(void)
        if (err)
                return err;
 
-       return usb_stor_scan(1) < 0 ? -ENODEV : 0;
+#ifndef CONFIG_DM_USB
+       err = usb_stor_scan(1) < 0 ? -ENODEV : 0;
+#endif
+
+       return err;
 }
 #else
 static inline int splash_init_usb(void)